diff --git a/0_cmake_library/cl.bat b/0_cmake_library/cl.bat deleted file mode 100644 index 749cc6e..0000000 --- a/0_cmake_library/cl.bat +++ /dev/null @@ -1,6 +0,0 @@ -@echo off -chcp 65001 >nul - -"%~dp0cl.exe" %* - -exit /b %errorlevel% \ No newline at end of file diff --git a/0_cmake_library/link.bat b/0_cmake_library/link.bat deleted file mode 100644 index b5b948d..0000000 --- a/0_cmake_library/link.bat +++ /dev/null @@ -1,5 +0,0 @@ -@echo off -chcp 65001 >nul -set VSLANG=1033 -"%~dp0link.exe" %* -exit /b %errorlevel% \ No newline at end of file diff --git a/0_cmake_library/link2.bat b/0_cmake_library/link2.bat deleted file mode 100644 index 0a445c4..0000000 --- a/0_cmake_library/link2.bat +++ /dev/null @@ -1,6 +0,0 @@ -@echo off -chcp 65001 >nul - -"%~dp0link.exe" %* - -exit /b %errorlevel% \ No newline at end of file diff --git a/register/register_library.cmake b/register/register_library.cmake index 1d09fc4..971d936 100644 --- a/register/register_library.cmake +++ b/register/register_library.cmake @@ -7,9 +7,14 @@ include(${CMAKE_CURRENT_LIST_DIR}/base.cmake) +set(oncurrencpp_opts) - - +_register_git_cmake_library( + concurrencpp + concurrencpp + https://github.com/David-Haim/concurrencpp.git + v.0.1.7 +) set(tinyxml2_opts) diff --git a/toolchain/vs2019.cmake b/toolchain/vs2019.cmake index 8f4da91..5f9cd9f 100644 --- a/toolchain/vs2019.cmake +++ b/toolchain/vs2019.cmake @@ -4,9 +4,9 @@ #set(CMAKE_CXX_COMPILER "${dir}/cl.exe") #set(CMAKE_C_COMPILER "${dir}/cl.exe") -get_filename_component(_compiler_dir "${CMAKE_CXX_COMPILER}" DIRECTORY) - -set(CMAKE_LINKER "${_compiler_dir}/link.bat") +#get_filename_component(_compiler_dir "${CMAKE_CXX_COMPILER}" DIRECTORY) +# +#set(CMAKE_LINKER "${_compiler_dir}/link.bat") #if(CMAKE_HOST_WIN32 AND CMAKE_GENERATOR MATCHES "Ninja")