Skip to content

Commit 223d857

Browse files
committed
Use add_definitions instead of set(CMAKE_CXX_FLAGS) to fix Windows build
Other changes: * Fix indentation in CMakeLists.txt (tabs to spaces) * Fix CMake builds outside of project directory
1 parent 41efc33 commit 223d857

1 file changed

Lines changed: 24 additions & 24 deletions

File tree

CMakeLists.txt

Lines changed: 24 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -12,50 +12,50 @@ file(GLOB SOURCE
1212
file(GLOB HEADERS
1313
"src/bncsutil/*.h"
1414
)
15-
set(CMAKE_MODULE_PATH CMake/Modules)
15+
set(CMAKE_MODULE_PATH ${PROJECT_SOURCE_DIR}/CMake/Modules)
1616

1717
add_library(${PROJECT_NAME} SHARED ${SOURCE} ${HEADERS})
1818
add_library(${PROJECT_NAME}_static STATIC ${SOURCE} ${HEADERS})
1919

2020
if (BUILD_32)
21-
set_target_properties(${PROJECT_NAME} PROPERTIES COMPILE_FLAGS "-m32" LINK_FLAGS "-m32")
22-
MESSAGE(STATUS "Excluding 64bit library paths from search.")
23-
set_property(GLOBAL PROPERTY FIND_LIBRARY_USE_LIB64_PATHS OFF)
24-
set(ARCH_RPM i686)
25-
set(ARCH_DEB i386)
21+
set_target_properties(${PROJECT_NAME} PROPERTIES COMPILE_FLAGS "-m32" LINK_FLAGS "-m32")
22+
MESSAGE(STATUS "Excluding 64bit library paths from search.")
23+
set_property(GLOBAL PROPERTY FIND_LIBRARY_USE_LIB64_PATHS OFF)
24+
set(ARCH_RPM i686)
25+
set(ARCH_DEB i386)
2626
elseif (BUILD_64)
27-
set_target_properties(${PROJECT_NAME} PROPERTIES COMPILE_FLAGS "-m64" LINK_FLAGS "-m64")
28-
set(ARCH_DEB amd64)
29-
set(ARCH_RM x86_64)
27+
set_target_properties(${PROJECT_NAME} PROPERTIES COMPILE_FLAGS "-m64" LINK_FLAGS "-m64")
28+
set(ARCH_DEB amd64)
29+
set(ARCH_RM x86_64)
3030
else()
31-
set(ARCH_DEB amd64)
32-
set(ARCH_RPM x86_64)
31+
set(ARCH_DEB amd64)
32+
set(ARCH_RPM x86_64)
3333
endif()
3434

3535
if (USE_MPIR)
36-
find_package(MPIR REQUIRED)
37-
include_directories(src ${MPIR_INCLUDE_DIR})
38-
target_link_libraries(${PROJECT_NAME} ${MPIR_LIBRARIES})
39-
add_definitions(-DUSE_MPIR=1)
36+
find_package(MPIR REQUIRED)
37+
include_directories(src ${MPIR_INCLUDE_DIR})
38+
target_link_libraries(${PROJECT_NAME} ${MPIR_LIBRARIES})
39+
add_definitions(-DUSE_MPIR=1)
4040
else()
41-
find_package(GMP REQUIRED)
42-
include_directories(src ${GMP_INCLUDE_DIR})
43-
target_link_libraries(${PROJECT_NAME} ${GMP_LIBRARIES})
41+
find_package(GMP REQUIRED)
42+
include_directories(src ${GMP_INCLUDE_DIR})
43+
target_link_libraries(${PROJECT_NAME} ${GMP_LIBRARIES})
4444
endif()
4545

4646
set_target_properties(${PROJECT_NAME} PROPERTIES OUTPUT_NAME bncsutil)
4747

4848
if(UNIX)
49-
set_target_properties(${PROJECT_NAME} PROPERTIES VERSION "${VERSION_MAJOR}.${VERSION_MINOR}.${VERSION_PATCH}")
50-
set_target_properties(${PROJECT_NAME} PROPERTIES SOVERSION 1)
49+
set_target_properties(${PROJECT_NAME} PROPERTIES VERSION "${VERSION_MAJOR}.${VERSION_MINOR}.${VERSION_PATCH}")
50+
set_target_properties(${PROJECT_NAME} PROPERTIES SOVERSION 1)
5151

52-
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wall -O3 -Wno-multichar -fPIC")
53-
set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Wall -O3 -Wno-multichar -fPIC")
52+
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wall -O3 -Wno-multichar -fPIC")
53+
set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Wall -O3 -Wno-multichar -fPIC")
5454
endif()
5555

5656
if (WIN32)
57-
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -D_CRT_SECURE_NO_WARNINGS -DMUTIL_LIB_BUILD=1")
58-
target_link_libraries(${PROJECT_NAME} Version.lib)
57+
add_definitions(-D_CRT_SECURE_NO_WARNINGS -DMUTIL_LIB_BUILD=1)
58+
target_link_libraries(${PROJECT_NAME} Version.lib)
5959
endif()
6060

6161
install(TARGETS bncsutil RUNTIME DESTINATION bin LIBRARY DESTINATION lib ARCHIVE DESTINATION lib)

0 commit comments

Comments
 (0)