fixed windows build data dir copy

nathancrews · Dec 2, 2023 · 68ff598 · 68ff598
1 parent 933c85f
commit 68ff598
Show file tree

Hide file tree

Showing 3 changed files with 20 additions and 11 deletions.
diff --git a/LandXML2glTF/CMakeLists.txt b/LandXML2glTF/CMakeLists.txt
@@ -1,7 +1,8 @@
 cmake_minimum_required(VERSION 3.5)
 
+set(CMAKE_CXX_STANDARD 17)
 set(CMAKE_CXX_STANDARD_REQUIRED ON)
-set(CMAKE_CXX_FLAGS_DEBUG "${CMAKE_CXX_FLAGS_DEBUG} -DDEBUG -D_DEBUG -DFEATURE_ASSERTS_ENABLED")
+
 set(CMAKE_OSX_DEPLOYMENT_TARGET 11.0)
 
 set (CMAKE_LIBRARY_OUTPUT_DIRECTORY  "${CMAKE_BINARY_DIR}/bin")

diff --git a/LandXML2glTF/LXML2glTF/CMakeLists.txt b/LandXML2glTF/LXML2glTF/CMakeLists.txt
@@ -1,7 +1,6 @@
 cmake_minimum_required(VERSION 3.5)
-project(LXML2GLTF)
 
-set(CMAKE_CXX_STANDARD 17)
+project(LXML2GLTF)
 
 add_compile_definitions(LANDXML2GLTFDLLAPI_IMPORT)
 
@@ -10,8 +9,23 @@ include_directories("../LandXML2glTFDll/Inc")
 
 add_executable(LXML2GLTF "${CMAKE_CURRENT_SOURCE_DIR}/Source/LXML2glTF.cpp")
 
+if (MSVC)
+    set_target_properties(LXML2GLTF PROPERTIES COMPILE_PDB_NAME "LXML2GLTF" COMPILE_PDB_OUTPUT_DIRECTORY "${LIBRARY_OUTPUT_DIRECTORY}")
+elseif (CMAKE_CXX_COMPILER_ID MATCHES "Clang")
+    target_compile_options(LXML2GLTF
+        PRIVATE "-fpic"
+        PRIVATE "-Wunguarded-availability"
+        PRIVATE "-Wall"
+        PRIVATE "-Werror"
+        PRIVATE "-Wunused-but-set-variable"
+        PUBLIC "-Wno-unknown-pragmas")
+elseif (CMAKE_CXX_COMPILER_ID MATCHES "GNU")
+    target_compile_options(LXML2GLTF
+        PRIVATE "-fPIC")
+endif()
+
 add_custom_command(TARGET LXML2GLTF POST_BUILD
-                   COMMAND "${CMAKE_COMMAND}" -E copy_if_different "${CMAKE_CURRENT_LIST_DIR}/data" "${CMAKE_BINARY_DIR}/bin/$<CONFIG>/"
+COMMAND "${CMAKE_COMMAND}" -E copy_directory "${CMAKE_CURRENT_LIST_DIR}/data" "${CMAKE_BINARY_DIR}/bin/$<CONFIG>/data"
 )
 
 target_link_libraries(LXML2GLTF PRIVATE LandXML2glTFDLL)
diff --git a/LandXML2glTF/LandXML2glTFDll/CMakeLists.txt b/LandXML2glTF/LandXML2glTFDll/CMakeLists.txt
@@ -2,15 +2,11 @@ cmake_minimum_required(VERSION 3.5)
 
 project(LandXML2glTFDLL)
 
-set(CMAKE_CXX_STANDARD 17)
 add_compile_definitions(LANDXML2GLTFDLLAPI_EXPORT)
 
 if (WIN32)
     add_compile_definitions(
-        _CRT_SECURE_NO_WARNINGS _SILENCE_EXPERIMENTAL_FILESYSTEM_DEPRECATION_WARNING
-    )
-    add_compile_options(
-        /MP
+        _CRT_SECURE_NO_WARNINGS
     )
 endif()
 
@@ -30,8 +26,6 @@ include_directories("../3rdparty/GLTFSDK/GLTFSDK/Inc/")
 add_library(LandXML2glTFDLL SHARED ${PROJECT_SRCS})
 
 if (MSVC)
-    target_compile_options(LandXML2glTFDLL PRIVATE "/Zi;/W4;/EHsc")
-
     set_target_properties(LandXML2glTFDLL PROPERTIES COMPILE_PDB_NAME "LandXML2glTFDLL" COMPILE_PDB_OUTPUT_DIRECTORY "${LIBRARY_OUTPUT_DIRECTORY}")
 elseif (CMAKE_CXX_COMPILER_ID MATCHES "Clang")
     target_compile_options(LandXML2glTFDLL