Skip to content
Snippets Groups Projects
Commit bca3de3d authored by Nils Dagsson Moskopp's avatar Nils Dagsson Moskopp
Browse files

Merge pull request #27 from Oblomov/master 

* regression fix for windows build.
parents 8129d16d 29aae3dc
No related branches found
No related tags found
No related merge requests found
Hide whitespace changes
Inline Side-by-side
Showing
with 3 additions and 2 deletions
src/CMakeLists.txt
+ 3
− 2
View file @ bca3de3d
...@@ -43,8 +43,6 @@ else() ...@@ -43,8 +43,6 @@ else()
find_package(JPEG REQUIRED) find_package(JPEG REQUIRED)
find_package(BZip2 REQUIRED) find_package(BZip2 REQUIRED)
find_package(PNG REQUIRED) find_package(PNG REQUIRED)
find_package(Jthread REQUIRED)
find_package(Sqlite3 REQUIRED)
if(APPLE) if(APPLE)
FIND_LIBRARY(CARBON_LIB Carbon) FIND_LIBRARY(CARBON_LIB Carbon)
FIND_LIBRARY(COCOA_LIB Cocoa) FIND_LIBRARY(COCOA_LIB Cocoa)
...@@ -65,6 +63,9 @@ else() ...@@ -65,6 +63,9 @@ else()
set(CLIENT_PLATFORM_LIBS ${CLIENT_PLATFORM_LIBS} ${XXF86VM_LIBRARY}) set(CLIENT_PLATFORM_LIBS ${CLIENT_PLATFORM_LIBS} ${XXF86VM_LIBRARY})
endif() endif()
find_package(Jthread REQUIRED)
find_package(Sqlite3 REQUIRED)
configure_file( configure_file(
"${PROJECT_SOURCE_DIR}/cmake_config.h.in" "${PROJECT_SOURCE_DIR}/cmake_config.h.in"
"${PROJECT_BINARY_DIR}/cmake_config.h" "${PROJECT_BINARY_DIR}/cmake_config.h"
......
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment