Explorar el Código

Some CMake fixes

Ivan Safrin hace 14 años
padre
commit
2014d61333
Se han modificado 2 ficheros con 5 adiciones y 1 borrados
  1. 4 0
      CMake/ExternalAssimp.cmake
  2. 1 1
      Tools/Contents/polyimport/CMakeLists.txt

+ 4 - 0
CMake/ExternalAssimp.cmake

@@ -12,6 +12,10 @@ SET(assimp_CMAKE_ARGS
     -DBUILD_TESTS=OFF
     -DBUILD_TESTS=OFF
 )
 )
 
 
+IF(APPLE)
+LIST(APPEND assimp_CMAKE_ARGS -DCMAKE_CXX_FLAGS_RELEASE="-O2")
+ENDIF(APPLE)
+
 ExternalProject_Add(assimp
 ExternalProject_Add(assimp
     PREFIX ${assimp_PREFIX}
     PREFIX ${assimp_PREFIX}
 
 

+ 1 - 1
Tools/Contents/polyimport/CMakeLists.txt

@@ -14,7 +14,7 @@ SET(CMAKE_DEBUG_POSTFIX "_d")
 
 
 #IF(POLYCODE_BUILD_STATIC)
 #IF(POLYCODE_BUILD_STATIC)
 ADD_EXECUTABLE(polyimport Source/polyimport.cpp Include/polyimport.h)
 ADD_EXECUTABLE(polyimport Source/polyimport.cpp Include/polyimport.h)
-TARGET_LINK_LIBRARIES(polyimport Polycore ${PHYSFS_LIBRARY}  ${ZLIB_LIBRARIES} ${ASSIMP_LIBRARIES}})
+TARGET_LINK_LIBRARIES(polyimport Polycore ${PHYSFS_LIBRARY}  ${ZLIB_LIBRARIES} ${ASSIMP_LIBRARIES})
 #ENDIF(POLYCODE_BUILD_STATIC)
 #ENDIF(POLYCODE_BUILD_STATIC)
 
 
 IF(POLYCODE_INSTALL_FRAMEWORK)
 IF(POLYCODE_INSTALL_FRAMEWORK)