Browse Source

Merge pull request #113 from AtomicGameEngine/JME-ATOMIC-FIXFEATUREEXAMPLES

[CPlusPlus] Update for CMake refactoring
JoshEngebretson 8 years ago
parent
commit
c449e69458
1 changed files with 4 additions and 6 deletions
  1. 4 6
      FeatureExamples/CPlusPlus/CMakeLists.txt

+ 4 - 6
FeatureExamples/CPlusPlus/CMakeLists.txt

@@ -1,17 +1,15 @@
 
 
-include_directories(${ATOMIC_INCLUDE_DIRS})
-
 # Define source files
 file (GLOB SOURCE_FILES Source/*.cpp Source/*.h)
 
-if (MSVC)
+if (WIN32)
     add_definitions(-DATOMIC_WIN32_CONSOLE)
 endif()
 
 add_executable(FeatureExamples ${SOURCE_FILES})
 
-target_link_libraries(FeatureExamples ${ATOMIC_LINK_LIBRARIES})
+target_link_libraries(FeatureExamples Atomic)
 
 # Copy AtomicTool to Artifacts
 add_custom_command( TARGET FeatureExamples POST_BUILD
@@ -21,7 +19,7 @@ add_custom_command( TARGET FeatureExamples POST_BUILD
                     ARGS -E copy_if_different \"$<TARGET_FILE:FeatureExamples>\" \"${ATOMIC_SOURCE_DIR}/Artifacts/Examples/CPlusPlus/\"
                     COMMENT "Copying FeatureExamples to Build Artifacts" )
 
-if (MSVC)
+if (WIN32)
 
   # pre-Windows 8 can't count on D3DCompiler_47.dll being on system
   add_custom_command (TARGET FeatureExamples POST_BUILD
@@ -30,4 +28,4 @@ if (MSVC)
   COMMAND ${CMAKE_COMMAND}
   ARGS -E copy_if_different \"${D3DCOMPILER_47_DLL}\" \"${ATOMIC_SOURCE_DIR}/Artifacts/Examples/CPlusPlus/D3DCompiler_47.dll\" )
 
-endif(MSVC)
+endif(WIN32)